destinator: Use new unicode functions of CET lib.

diff --git a/destinator.c b/destinator.c
index 60a71f232fa381f9edc3af4b214c59507c4cecdd..7ddac676c70b7dc4e337aff84561cb719161cc8f 100644 (file)
--- a/destinator.c
+++ b/destinator.c
@@ -24,6 +24,7 @@
 
 #include "defs.h"
 #include "cet.h"
+#include "cet_util.h"
 #include "garmin_fs.h"
 #include "strptime.h"
 #include <ctype.h>
@@ -97,17 +98,12 @@ read_wcstr(const int discard)
 static void
 write_wcstr(const char *str)
 {
-       if (str && *str) {
-               int bytes, value;
-               char *cin = (char *)str;
-               char *ce = cin + strlen(cin);
-               while (cin < ce) {
-                       cet_utf8_to_ucs4(cin, &bytes, &value);
-                       cin += bytes;
-                       gbfputint16(value, fout);
-               }
-       }
-       gbfputint16(0, fout);
+       int len;
+       short *unicode;
+       
+       unicode = cet_str_utf8_to_uni(str, &len);
+       gbfwrite((void *)unicode, 2, len + 1, fout);
+       xfree(unicode);
 }
 
 static int